Skip to content

chore: sync upstream (2026-11-22) - #35

Open
getBoolean wants to merge 140 commits into
mainfrom
sync/upstream-2026-11-22
Open

getBoolean wants to merge 140 commits into
mainfrom
sync/upstream-2026-11-22

Conversation

@getBoolean

@getBoolean getBoolean commented Nov 22, 2026 •

Copy link
Copy Markdown
Owner

Merges upstream pingdotgg/t3code main into the fork: c1464d6774..a35b3ca9f0 (139 commits), as a merge commit with upstream history kept.

Conflicts and how they were resolved

8 files conflicted. In each, upstream's change was taken and the fork's intent from .github/fork-manifest.txt re-applied.

  • apps/server/src/git/GitManager.ts: upstream's commit now catches GitNothingToCommitError (returns skipped_no_changes) and passes stage.unverified for custom commits. Took that and kept the fork's env (bound git account) on the commit call.
  • apps/server/src/vcs/GitVcsDriver.ts: GitCommitOptions.stage takes upstream's new unverified flag; the fork's env option is kept beside it.
  • apps/server/src/vcs/GitVcsDriverCore.ts (pushCurrentBranch): upstream now refreshes the upstream ref and reads readStatusDetailsRemote(cwd, false, false) instead of statusDetails. Took that and kept the fork's pushOptions carrying the account env to every push.
  • packages/provider-acp/src/server/clientTerminals.ts: upstream added a Git-for-Windows bash shell for shell-source commands, resolved from the terminal environment. Kept the fork's account overlay (merged → environment) first, so upstream's git lookup and the spawned terminal both see the overlaid environment.
  • apps/web/vite.config.ts / apps/web/src/vite-env.d.ts: upstream removed T3CODE_FEATURE_SECRETS (now server-side T3CODE_FEATURE_FLAGS, feat: read feature flags from one T3CODE_FEATURE_FLAGS service pingdotgg/t3code#40594). Dropped it; kept the fork's T3CODE_RELEASE_REPOSITORY fallback, the VITEST guard and T3CODE_NPM_RELEASES.
  • apps/mobile/.../thread-inspector-navigation.test.tsx: route list has the fork's ThreadBackgroundWork plus upstream's new ThreadReview and GitConfirm.
  • apps/server/src/provider/agentContextBudget.json: re-measured. Upstream's new tool text plus the fork's git-account tooling give mcpToolListJsonBytes 59947 (fork main 59803, upstream 59170). Growth comes from upstream's text, so this PR carries the agent-context-increase label.

No patched dependency was bumped. Upstream added a new patch, @legendapp/list@3.7.3, which applies cleanly.

Fork adaptations

None needed beyond the conflict resolutions.

  • Fork CI: enabling-fork-ci --rewrite-runners --prefix T3CODE found nothing to rewrite. Upstream changed no workflow files, and added no new pingdotgg/t3code guards or macOS jobs.

Verification

  • bash scripts/check-fork-manifest.sh: 574 entries present.
  • Fork suites:
    • server: src/gitAccounts, Manager, npmRelease, PullRequestService, mcp/toolkits/project, plus GitManager, GitVcsDriverCore and AgentContextBudget: 867 passed.
    • packages/provider-acp: 108 passed.
    • web: GitAccountsSettings: 2 passed.
    • mobile: remoteRegistration and thread-inspector-navigation: 41 passed.
  • vp run check:changed: format, lint, knip, unused patches, graphql, typecheck (43 packages) and React compiler pass. The changed-file tests fail 6 cases in GitVcsDriver.test.ts (checkpoint pack cleanup) and UsageService.test.ts (/private/var vs /var paths) on this Mac only. The same 6 fail on unmodified upstream/main here, and all 8 Linux server shards pass in CI.
  • CI: every check passes except Test Web 2, which failed on all 4 attempts. The Test failure on attempt 1 (upstream's new DesktopCliShim.test.ts AppImage SIGTERM case) passed on re-run.
    • Attempt 1: upstream's new browserHistoryStore.browser.test.ts (fix(web): preserve browser history across open tabs pingdotgg/t3code#40543, IndexedDB shared across tabs) timed out in 2 cases.
    • Attempts 2–4: Chromium dropped its connection to the test runner mid-shard (VITEST_BROWSER_CONNECTION_CLOSED), each time in a different file, after browserHistoryStore had run. Every test that did run passed.
    • Neither the test file nor browserHistoryStore.ts differs from upstream. Upstream's shard 2 holds the same files (the fork adds only GitAccountsSettings.browser.test.tsx). Upstream's CI is green on its 8 vCPU Blacksmith runners; the fork runs Test Web on ubuntu-24.04 (T3CODE_LINUX_RUNNER).
    • Locally the file passes on its own and next to PreviewView, ChatView and Sidebar, which also load the history store. It times out only in a full shard on a busy machine.

Owner decision needed: this looks like a load-sensitive upstream test that the fork's smaller CI runner exposes. Options: give Test Web a larger runner, shard the web tests further, or add a fork-owned workaround for this test file. Not merged until then.

iOS 17

apps/mobile/app.config.ts keeps deploymentTarget: "17.0", so the proof ran on this Mac.

  • Risk review: no new or bumped native dependencies and no podspec changes. The only native change is a one-line drawing tweak in T3ReviewDiffView.swift (max(changeBarWidth, 4)). Upstream removed secretsFeatureEnabled from app.config.ts. infra/relay only changed surrogate-safe truncation; nothing uses iosMajorVersion. The JS changes add no iOS 18+ features (selectionMenuConfig for react-native-enriched-markdown is JS config).
  • Build: prebuild, /opt/homebrew/bin/pod install, then xcodebuild Release for generic/platform=iOS Simulator with Xcode 26.6: BUILD SUCCEEDED. Every deployment target is at most 17.0 (16.4 and 17.0 only).
  • Symbols: check-ios17-libcxx-imports.sh: 7 Mach-O files import 277 libc++ symbols, all exported by iOS 17.0. check_runtime_symbols.py --runtime 17.0: 10986 imports checked, nothing missing.
  • Launch: the Release app ran past 60 s on an iOS 17.0 iPhone 15 and an iOS 17.0 iPad Pro 11" (4th gen) simulator, with the same PID throughout.
  • Native walk: native-surfaces-open passed with 0 failed steps on both the iPhone and the iPad (--pose ipad).
iPhone 15 (iOS 17.0) iPad Pro 11" (iOS 17.0)
Launch
Compose
Source control (git accounts)

Opus 5.5 (claude-opus-5-5) via Claude Code in T3 Code.

turnercore and others added 30 commits November 21, 2026 04:16
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40282)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ng (pingdotgg#40316)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…the thread a second time (pingdotgg#40311)

Co-authored-by: Orin <orin@orin.ws>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#40297)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40299)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#40381)

Co-authored-by: Abaan <abaan@Abaans-MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… update fails (pingdotgg#37225)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 29 commits November 22, 2026 01:00
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its destination (pingdotgg#40739)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#40767)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40783)

Co-authored-by: geezoria <25051260+geezoria@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ation (pingdotgg#33916)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40781)

Co-authored-by: Abhiram-745 <237478249+Abhiram-745@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: shadowfeind <travestroy007@gmail.com>
…ingdotgg#36802)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…tgg#40778)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…reloads them mid-run (pingdotgg#31999)

Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ills (pingdotgg#40808)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…us (pingdotgg#31295)

Co-authored-by: Justin <159104807+Justin24506@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…(body edit 10.3 s → 5.4 s) (pingdotgg#30879)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…11-22

# Conflicts:
#	apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx
#	apps/server/src/git/GitManager.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/vcs/GitVcsDriver.ts
#	apps/server/src/vcs/GitVcsDriverCore.ts
#	apps/web/src/vite-env.d.ts
#	apps/web/vite.config.ts
#	packages/provider-acp/src/server/clientTerminals.ts
@getBoolean getBoolean added the agent-context-increase Accepts growth in the agent context budget label Nov 22, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accepts growth in the agent context budget

Projects

None yet

Development

Successfully merging this pull request may close these issues.